Make dropdown arrows consistent size

Since the agregate menu does 120% of font-size, make this
for all dropdown arrows in gnome-shell and rename the css
class to make clear that it is used in overall gnome-shell

https://bugzilla.gnome.org/show_bug.cgi?id=709564

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 2523a9675a37ff47d63da45c7a8c51b939a30e8f..feae78ce748c10cfdf6075c0a1e003c316e13ba2 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -157,7 +157,7 @@ StScrollBar StButton#vhandle:active {
     min-width: 200px;
 }
 
-.popup-submenu-menu-item-triangle {
+.unicode-arrow {
     font-size: 120%;
 }
 

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 823df4308048a21af308d65bddfdabfe4b2af88e..2337a63bdca0c0d8911d794171e208a0e1809088 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -213,9 +213,7 @@ const AppMenuButton = new Lang.Class({
         this._label = new TextShadower();
         this._label.actor.y_align = Clutter.ActorAlign.CENTER;
         this._hbox.add_actor(this._label.actor);
-        this._arrow = new St.Label({ text: '\u25BE',
-                                     y_expand: true,
-                                     y_align: Clutter.ActorAlign.CENTER });
+        this._arrow = PopupMenu.unicodeArrow(St.Side.BOTTOM);
         this._hbox.add_actor(this._arrow);
 
         this._iconBottomClip = 0;
@@ -833,9 +831,7 @@ const AggregateMenu = new Lang.Class({
         this._indicators.add_child(this._rfkill.indicators);
         this._indicators.add_child(this._volume.indicators);
         this._indicators.add_child(this._power.indicators);
-        this._indicators.add_child(new St.Label({ text: '\u25BE',
-                                                  y_expand: true,
-                                                  y_align: Clutter.ActorAlign.CENTER }));
+        this._indicators.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));
 
         this.menu.addMenuItem(this._volume.menu);
         this.menu.addMenuItem(this._brightness.menu);

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index eeb777df5eabe3b72ced3557c43e048788901569..07ad2110c471a06154ce346f6b0920682e3c90fd 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -42,6 +42,32 @@ function isPopupMenuItemVisible(child) {
     return child.visible;
 }
 
+/**
+ * @side Side to which the arrow points.
+ */
+function unicodeArrow(side) {
+    let arrowChar;
+    switch (side) {
+        case St.Side.TOP:
+            arrowChar = '\u25B4';
+            break;
+        case St.Side.RIGHT:
+            arrowChar = '\u25B8';
+            break;
+        case St.Side.BOTTOM:
+            arrowChar = '\u25BE';
+            break;
+        case St.Side.LEFT:
+            arrowChar = '\u25C2';
+            break;
+    }
+
+    return new St.Label({ text: arrowChar,
+                          style_class: 'unicode-arrow',
+                          y_expand: true,
+                          y_align: Clutter.ActorAlign.CENTER });
+}
+
 const PopupBaseMenuItem = new Lang.Class({
     Name: 'PopupBaseMenuItem',
 
@@ -962,8 +988,7 @@ const PopupSubMenuMenuItem = new Lang.Class({
                                      y_align: Clutter.ActorAlign.CENTER });
         this.actor.add_child(this.status);
 
-        this._triangle = new St.Label({ text: '\u25B8',
-                                        style_class: 'popup-submenu-menu-item-triangle' });
+        this._triangle = unicodeArrow(St.Side.RIGHT);
         this._triangle.pivot_point = new Clutter.Point({ x: 0.5, y: 0.6 });
 
         this._triangleBin = new St.Widget({ y_expand: true,

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 996a24d184b552c7a808e3431f01a96177a002d9..81c37bf619abc2d59e0ff44c589bda5ac46fa77a 100644 (file)
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -43,9 +43,7 @@ const ATIndicator = new Lang.Class({
         this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         this._hbox.add_child(new St.Icon({ style_class: 'system-status-icon',
                                            icon_name: 'preferences-desktop-accessibility-symbolic' }));
-        this._hbox.add_child(new St.Label({ text: '\u25BE',
-                                            y_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER }));
+        this._hbox.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));
 
         this.actor.add_child(this._hbox);
 

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 5e93a8cf56d59ccc67a7c0d100dd1704d69ac76b..ac4ae2db49ee4d96ae1be70a86117a5d3538b524 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -339,9 +339,7 @@ const InputSourceIndicator = new Lang.Class({
 
         this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
         this._hbox.add_child(this._container);
-        this._hbox.add_child(new St.Label({ text: '\u25BE',
-                                            y_expand: true,
-                                            y_align: Clutter.ActorAlign.CENTER }));
+        this._hbox.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM));
 
         this.actor.add_child(this._hbox);
         this.actor.add_style_class_name('panel-status-button');